Autogenerated HTML docs for v1.4.4.2-gee60
diff --git a/git-merge-file.html b/git-merge-file.html new file mode 100644 index 0000000..e74295b --- /dev/null +++ b/git-merge-file.html
@@ -0,0 +1,384 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<meta name="generator" content="AsciiDoc 7.0.2" /> +<style type="text/css"> +/* Debug borders */ +p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { +/* + border: 1px solid red; +*/ +} + +body { + margin: 1em 5% 1em 5%; +} + +a { color: blue; } +a:visited { color: fuchsia; } + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +tt { + color: navy; +} + +h1, h2, h3, h4, h5, h6 { + color: #527bbd; + font-family: sans-serif; + margin-top: 1.2em; + margin-bottom: 0.5em; + line-height: 1.3; +} + +h1 { + border-bottom: 2px solid silver; +} +h2 { + border-bottom: 2px solid silver; + padding-top: 0.5em; +} + +div.sectionbody { + font-family: serif; + margin-left: 0; +} + +hr { + border: 1px solid silver; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +pre { + padding: 0; + margin: 0; +} + +span#author { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + font-size: 1.2em; +} +span#email { +} +span#revision { + font-family: sans-serif; +} + +div#footer { + font-family: sans-serif; + font-size: small; + border-top: 2px solid silver; + padding-top: 0.5em; + margin-top: 4.0em; +} +div#footer-text { + float: left; + padding-bottom: 0.5em; +} +div#footer-badges { + float: right; + padding-bottom: 0.5em; +} + +div#preamble, +div.tableblock, div.imageblock, div.exampleblock, div.verseblock, +div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, +div.admonitionblock { + margin-right: 10%; + margin-top: 1.5em; + margin-bottom: 1.5em; +} +div.admonitionblock { + margin-top: 2.5em; + margin-bottom: 2.5em; +} + +div.content { /* Block element content. */ + padding: 0; +} + +/* Block element titles. */ +div.title, caption.title { + font-family: sans-serif; + font-weight: bold; + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} +div.title + * { + margin-top: 0; +} + +td div.title:first-child { + margin-top: 0.0em; +} +div.content div.title:first-child { + margin-top: 0.0em; +} +div.content + div.title { + margin-top: 0.0em; +} + +div.sidebarblock > div.content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} + +div.listingblock > div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock > div.content { + padding-left: 2.0em; +} +div.quoteblock .attribution { + text-align: right; +} + +div.admonitionblock .icon { + vertical-align: top; + font-size: 1.1em; + font-weight: bold; + text-decoration: underline; + color: #527bbd; + padding-right: 0.5em; +} +div.admonitionblock td.content { + padding-left: 0.5em; + border-left: 2px solid silver; +} + +div.exampleblock > div.content { + border-left: 2px solid silver; + padding: 0.5em; +} + +div.verseblock div.content { + white-space: pre; +} + +div.imageblock div.content { padding-left: 0; } +div.imageblock img { border: 1px solid silver; } +span.image img { border-style: none; } + +dl { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +dt { + margin-top: 0.5em; + margin-bottom: 0; + font-style: italic; +} +dd > *:first-child { + margin-top: 0; +} + +ul, ol { + list-style-position: outside; +} +ol.olist2 { + list-style-type: lower-alpha; +} + +div.tableblock > table { + border-color: #527bbd; + border-width: 3px; +} +thead { + font-family: sans-serif; + font-weight: bold; +} +tfoot { + font-weight: bold; +} + +div.hlist { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +td.hlist1 { + vertical-align: top; + font-style: italic; + padding-right: 0.8em; +} +td.hlist2 { + vertical-align: top; +} + +@media print { + div#footer-badges { display: none; } +} +include::./stylesheets/xhtml11-manpage.css[] +/* Workarounds for IE6's broken and incomplete CSS2. */ + +div.sidebar-content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} +div.sidebar-title, div.image-title { + font-family: sans-serif; + font-weight: bold; + margin-top: 0.0em; + margin-bottom: 0.5em; +} + +div.listingblock div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock-content { + padding-left: 2.0em; +} + +div.exampleblock-content { + border-left: 2px solid silver; + padding-left: 0.5em; +} +</style> +<title>git-merge-file(1)</title> +</head> +<body> +<div id="header"> +<h1> +git-merge-file(1) Manual Page +</h1> +<h2>NAME</h2> +<div class="sectionbody"> +<p>git-merge-file - + three-way file merge +</p> +</div> +</div> +<h2>SYNOPSIS</h2> +<div class="sectionbody"> +<div class="verseblock"> +<div class="content"><em>git-merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] + [-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file></div></div> +</div> +<h2>DESCRIPTION</h2> +<div class="sectionbody"> +<p>git-file-merge incorporates all changes that lead from the <tt><base-file></tt> +to <tt><other-file></tt> into <tt><current-file></tt>. The result ordinarily goes into +<tt><current-file></tt>. git-merge-file is useful for combining separate changes +to an original. Suppose <tt><base-file></tt> is the original, and both +<tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>. +Then git-merge-file combines both changes.</p> +<p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes +in a common segment of lines. If a conflict is found, git-merge-file +normally outputs a warning and brackets the conflict with <<<<<<< and +>>>>>>> lines. A typical conflict will look like this:</p> +<div class="literalblock"> +<div class="content"> +<pre><tt><<<<<<< A +lines in file A +======= +lines in file B +>>>>>>> B</tt></pre> +</div></div> +<p>If there are conflicts, the user should edit the result and delete one of +the alternatives.</p> +<p>The exit value of this program is negative on error, and the number of +conflicts otherwise. If the merge was clean, the exit value is 0.</p> +<p>git-merge-file is designed to be a minimal clone of RCS merge, that is, it +implements all of RCS merge's functionality which is needed by +<a href="git.html">git(1)</a>.</p> +</div> +<h2>OPTIONS</h2> +<div class="sectionbody"> +<dl> +<dt> +-L <label> +</dt> +<dd> +<p> + This option may be given up to three times, and + specifies labels to be used in place of the + corresponding file names in conflict reports. That is, + <tt>git-merge-file -L x -L y -L z a b c</tt> generates output that + looks like it came from files x, y and z instead of + from files a, b and c. +</p> +</dd> +<dt> +-p +</dt> +<dd> +<p> + Send results to standard output instead of overwriting + <tt><current-file></tt>. +</p> +</dd> +<dt> +-q +</dt> +<dd> +<p> + Quiet; do not warn about conflicts. +</p> +</dd> +</dl> +</div> +<h2>EXAMPLES</h2> +<div class="sectionbody"> +<dl> +<dt> +git merge-file README.my README README.upstream +</dt> +<dd> +<p> + combines the changes of README.my and README.upstream since README, + tries to merge them and writes the result into README.my. +</p> +</dd> +<dt> +git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345 +</dt> +<dd> +<p> + merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels + <tt>a</tt> and <tt>c</tt> instead of <tt>tmp/a123</tt> and <tt>tmp/c345</tt>. +</p> +</dd> +</dl> +</div> +<h2>Author</h2> +<div class="sectionbody"> +<p>Written by Johannes Schindelin <johannes.schindelin@gmx.de></p> +</div> +<h2>Documentation</h2> +<div class="sectionbody"> +<p>Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, +with parts copied from the original documentation of RCS merge.</p> +</div> +<h2>GIT</h2> +<div class="sectionbody"> +<p>Part of the <a href="git.html">git(7)</a> suite</p> +</div> +<div id="footer"> +<div id="footer-text"> +Last updated 17-Dec-2006 19:31:44 UTC +</div> +</div> +</body> +</html> 